From: Joakim Verona <joakim@verona.se>
Date: Mon, 19 Aug 2013 10:31:39 +0000 (+0200)
Subject: merge from trunk
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=af31e21fc617018e7244fe0c9ceb43b1a5c0f52c;p=emacs.git

merge from trunk
---

af31e21fc617018e7244fe0c9ceb43b1a5c0f52c